add tofix note
Remove legacy contextual stuff, and a reminder to do this more thoroughly
Temp, really!