Upgrade and clean up solution
Remove debug code :-(