Remove commented boilerplate