cleanup/simplification of SoureBase