prep work
removed old code