Removed clutter for debugiing