removed diagnostic stuff