cleanup loader fixes #4926