Removed obsolete/deprecated stuff