FL-1757: remove unmaintained mix-ins