Cleaning package build and improving connection usage