FL-1845: clean-up