Refactoring Part 1: Remove of Webapi calls.