Cleanup and fixing image pre-loader.