Fix splitter removal in all situations