removed some miss-copied code