Reverted some useless changes from trunk and removed superfluous comments.