removed some set but not used variables