removed some unwanted code
Fixed merge errors