removed obsolete functions, replaced by OOP