Significant cleaning and deletions of unused codepaths.