Initial clean up of source base