COMMON: cleanup obsolete code