Remove old code from main.cc