Clean apis

there we go!