Removed obsolete, pre-plugin code