cleaned up some no longer used, commented out code