Fixes critical remove errors