removed unneeded callback calls