Removed ->api form calls, as mentioned in #2