These two lines have become redundant, haven't they?