Intial commit
Cleanup