removing two mix-ins that we weren't using

let us know if you want them back please