remove double-loading