cleaned up code
removed old vesion