Update make clean, use c++03 std, remove unused functions from main