Some cleanups - and do no longer rely on the -debug extJs