Cleanup for future boilerplate template