Mega CleanUp and SmallTweak Commit