removed menu system, cleaned up