Further clean up (removed imagesLoaded)