FIX: dependencies cleanup