Removed remaining boilerplate.