Cleaning-up non-Claymus code.