removed old code
cleaned up script