Removed unnecessary variables