Fixed RAC 2.0 deprecations
Remove custom presentation logic