Remove logs and clean up fixed code