source directory cleanups