Education stub and further clean up