cleanup
dont use deprecated method
temp hack util #CO-28 ill be fixed