21.07 update, improved pitbull4 config and cleanup