Added deps from platform-api. Removed unused