Removed Superfluous Variables