removed some temp code