Remove more variables