Cleaned up code and removed unnecessary files
Removed test code