Feature/gerrit cleanup

gerrit integration and some cleanups