Removed unused broken code

Replaces #485