Intertim changes
Cleanups