Cleaning around approval improvements