Performed some clean-up on stray code