Remove unneccessary comments and services