Removed dead code

fixes #1225