refactoring
cleaned up a bit- throw away unused code