Clean up procs.
Merge pull request #876 from ESwordTheCat/ubn2DxAa

Clean up procs.