Death to extra spaces