clean up, some types