Cleaned up code, and deleted unused files.