remove this and all the commented out code below