Further cleanup + test passing [by Bertg]