Useless variables removed