Cleanup old base stuff