Cleanup of unused code.