Clean up - Removed unwanted temp files, commented the unwanted references