Clean up and add more service examples