took away useless variables