starting moat clean up

n30community give the moat a good clean