clean up
remove another recursion