Removed crappy code