Remove un-used imports and logging