cleaning things up
cleaning logger bug, cleaning unused variables
cleaned conflicts