Fix error with collection AND Removing comments