cleanup, switch to gem exec-code