Loader cleanup