Remove debug stmts, unused pkgs, prepare merge

Prepare for merge with main sprint4 branch.