Chore: Code cleanup

Merged Akshay Bharambe requested to merge ab_RemoveDeadCodeFDB into devbranch
  1. Addressed unhandled errors, variable assignments.
  2. Commented dead code. It can be removed after a stable release.

Merge request reports