Add missing annotations, remove EconomyAPI.