cleared some unnecessary clutter