Remove obsolete code part 3