More unnecessary variables removed