removed erroneous stuffs
cleaned up some erroneous things