cleanup and temp code