Removed packages
Fixed build