Removed some unwanted code