Cleaned up source tree

Removed unnecessary references