More package cleanup