Cleaned up AI and other stuff