* Rendering mappings * Remove duplicate class * Suggestions by liach and juuxel * Unmap inferred field and move to better package