Code clean-up. Removal of some over-zealous debugging lines.