Try some optimization to speed up start up time. Clean ups.