src/main.c: additional cleanup