Cleanup day 1

Code cleanup day