Big fat cleanup and GCC fix batch