removing code coomented out