removing some un-used variables