working on simplifications
removed old code