various package cleanup