Clean up and maintainance on commerce branch