Viewdata cleanup