removed custom loader