Services.js cleanup