Removed unused code, see #26