Removed obsolete mix-in