Removing unnecessary work