Removed unnecessary vars