Remove debug code
Tidy
Change options / config checking