removing comments, updating schema