Removed obsolete functions that were moved to line