Removing unnecessary variables