Remove logs and unused functions