Remove log macro and add verbose 'n' debug