Will be useful later. Some more cleanup: obsolete I/O variables moved into soon-to-become obsolete routines