Removing some unnecessary variables