Version Update
Cleanups