removed incorrect classes