Removed needless variables