Code cleanup; Remove unused variable which is passed around, and remove copy of static value