tidy up commercial component loader