Major slimdown of the Canvas