Cleared out some defunct code