removed unnecessary code bits