TJ/HM: uhm removed unused kwargs