Removing some unnecessary final on methods