Clean up and maintainance on commerce branch

Getting ready to start merging this bad boy into master.