Cleanup

Dogfood using our features :-).