clean up mixin file

Change-Id: I12ded172c908d73dfef05cc4420a8a29ea2d2631