Removed inappropriate variables