did todo and clean up cached var