cleaned up code, removed old code