WEB-662 - Removing more of the debug stuff