State hospitals to end separation of mentally ill and retarded