Removed unnecessary code form user