Input section cleanups