further cleaning up of source tree