Rollback fixes for #96
Remove dead code