Removed log and todo