DECUPAS-16 code cleanup