Remove logging, version protection