cleanning up before release to FI-ware excellence