removed some unwanted code