Remove comments, simplify everything