Cleaning up logic/input framework