removed unnecessary code, fixes #8