changed to mixin only

had to remove OOP.inherit because it breaks tern