Remove AnyVal classes due to issue around mongo serialisation/searching, not worth the hassle