remove some unused bits
fix packaging