FIX: remove dependency on *.application