You could remove this if you are able to remove the @Type's on lines 129 and 138.