Removed dead code, fixes #141