Remove multiplicative from working tree
Removing image cropping, do some optimization