Cleanup and Fix Point And fix Radio New Interface
Fix
Removed fields