Cleanup loader and use subrequest