Removed obsolete code

Fixes #1152