Updated some vars before removal