Remove temp code