Cleanup. jam2012 solutions incomplete or incorrect. will cleanup later