Cleanup second degree dependencies