Clean up code and example manifest