Removed extra comments and old file