Merge "Remove unneeded main.cpp"