rm comments
add exceptions