removed a bunch of unstable stuff that accidentally made it in
Cleaned up master branch