Loader clean up