Cleanup in wrasse, some TODOs