explicitly read from primary, misc cleanup