Baselli cleanups