Remove dependency to 'package-settings'