Chore: Code cleanup

Merged Akshay Bharambe requested to merge ab_RemoveDeadCodeFDB into devbranch