Tidying: Removed commented out code and redundant files.