Minor cleanup
Remove clutter comments