Removed obsolete code

Closes #1351