Obsolete code deleted
Delete more obsolete code