removed obsolete functions x)