I think this is redundant code, removed here...