Tweak it not to use services