fix conditionals; remove retry validation