Removed a few unused variables, logging & classes.