fixed calling unneeded classes