Clean out some commented code
Edit and View now working
Merge branch 'hotfix/bpfd-250'