Removed obsolete functions