finish deprecated mixin organization