removing debugbar and some small changes