Finish last clean up of Ticket0281