Remove comments etc