optimised and remove debugbar