Cleanup

One failing test...