CMF-27: code cleanup