Remove some spacial overkill