clean up data and add delete capabilities