Base: Clean and more global variable removal