Fixes after refactor. Removing unused inference code