fix errors and remove unneeded code added in prior commits (1b1586b, fbaed0f)
fix errors and remove unneeded code added in prior commits (1b1586b, fbaed0f)

JoeCohen/mushroom-observer,raysuelzer/mushroom-observer,raysuelzer/mushroom-observer,JoeCohen/mushroom-observer,MushroomObserver/mushroom-observer,pellaea/mushroom-observer,pellaea/mushroom-observer,JoeCohen/mushroom-observer,raysuelzer/mushroom-observer,MushroomObserver/mushroom-observer,pellaea/mushroom-observer,MushroomObserver/mushroom-observer,JoeCohen/mushroom-observer,JoeCohen/mushroom-observer,MushroomObserver/mushroom-observer,MushroomObserver/mushroom-observer,raysuelzer/mushroom-observer,MushroomObserver/mushroom-observer,MushroomObserver/mushroom-observer,pellaea/mushroom-observer,raysuelzer/mushroom-observer,raysuelzer/mushroom-observer,pellaea/mushroom-observer,pellaea/mushroom-observer,raysuelzer/mushroom-observer,pellaea/mushroom-observer,JoeCohen/mushroom-observer,JoeCohen/mushroom-observer