Remove Staging for scrolling bug