Removing code that breaks