removed unnecessary chunks of code