update, removing lots of things that aren't going to work without major tweaks