views / package cleanup