Removing code related to work arounds for the bug