Minor cleanIt is now the users responsibility to include rich/base