removing unnecessary mixin :rage1: