Remove map; refactor answer to no longer create answers