#673 - remove obsolete code