Remove some debug stuff.
...and rebuild