US573 - Removing some crappy code.