objectifier fix
cleanup