Removed some variables