more clean up of Florin mess