Cleaned up the source tree