Slight cleanup of pre-dependencies init