Can we remove this? It's a damn pain every second upgrade :P