Remove leftover debug code
Cleanup syntax