removed clutter. added object dependencies