removed all references to OakImage etc