some cleanup work.