removed unwanted vars