Removing code from other PR