Removed mappedsupper class annotations