Remove logging, etc.