Clean up now that it works