DEVEN-175 cleanup