Updated documentation and removed obsolete functions