Bulk clean up of methods