Remove performance killers
moat updates