Removing dirty puts calls