Cleaned up in loader classes.