Removed API dependencies from UI code, but havent yet replaced them with connector code
Cleaned up orphaned query annotations
Merge branch 'sdj'