Added code to cleanup order attribute in the db