removed comment out code