Cut some things and switch redis to package