Performance fixes + Clean