Remove logging statements and old file