Woody and portal-fw in 2.2?

[Ralph Goers]

Why are these blocks even in 2.2?  They are excluded from the build but
they are deprecated in 2.1 and have replacements.

Can they be removed?

Ralph