Removed several unused variables and merged double if statements (#1633) * Removed unused variable * Merged if statements Co-authored-by: Rubat <robotboy655@gmail.com>