SITE-622: Done some code cleanup.