started clean up of main
Finished merge