Wip/ret eq false and cleanup