#32 cleanup