stripped out more packages