remove crappy code