Remove use of arrows