Removed obsolete functions and variables