? 54-58, 65-69: if these lines of code are not used, shouldn't they be removed from the final version?