Remove logging and source format