#146 removed unnecessary chunk of code added in previous commit