Code is compiling again, time for some cleanup and get rid of deprecated stuff (some things might be lingering in the execution path still, so will have to do this before I merge to main).