FIX: dependency clean up