PER-103 Removing some unused variables