Removing unneeded building blocks.
Removing unneeded building blocks - second round.