removed some accidental crappy code