Remove log and unused class