removal of temp code