Clean up and link to external services