Cleaned up code (removed old files and unused variables)