Fix removing

Space+ adding back some lines of code