removed extra variables