Remove unused attributes and refaddr