Cleaning up and planning for render optimising