Clean up trade api and ng services