Removed some more unnecessary backwards compat code, using Services.jsm consistently now