- removed soleil specific stuff