Removed obsolete functionality