Clean-ups for GCC building