Remove system-settings dependency