cleaned up source tree