Remove more resolution-specific variables