Remove comments. Add date