Removed superfluous code and commentary.