Further optimisations, removing unnecessary image-loading.