Removed leftover debugging code
Fix '!' in assertion messages
Cleanup TODO