Code cleanup. Contextuals are gone