Cleanup some global declarations