Cleanup
A couple of soda submissions