Start cleanup to match boilerplate.