Made TimeStep Cleaner