removed crappy code