removing code that isn't mine