removed unused code | fixes #8