Clean up, removed outdated and unused source files