removing code that might not have been needed?