Clean up commenting