* add more debugging and remove possible problematic inheritance * remove unused functions * remove extra conversion * ensure cirrect type is used --------- Co-authored-by: Oliver <oliver.henry.walters@gmail.com>