Boilerplate Comments Cleanup