Adds check to remove method