removing deprecated calls
simplified the logic of deleting/saving
updating the redirects to use the constant, easier to update;

updated the state handling to use our wrapper