Clean up the code for service/asset references