removing code that should not have made it in