Title: Don't remove it, upgrade it!