cleanup old context model code