WIP: Remove map and @character from double rendering in controller