Clean things up (preparing for bigger update)