Removing code that is no longer needed