Cleared out more old code