Cleanup necessary to pass lint.