Remove content view subviews when rebuilding subviewviews

Old contentView was never removed when a new contentView was set.