fixes
removed clutter