Removed debug & test code. Small cleanup.