cleanup and notes to add some steps of derivations later