removing nonused directory
Fixed merge problem, commented line