Remove logging and some other stuff