Removing code that is no longer necessary