Cleared mixed code of NewGui and Master