Cleanup and make it all work