More default packages and cleanup