Removed unused code and soe whitespace changes.