cleaning up dependent stuff more