ALMON-14 : remove unused mixin + move definition file