Removing unneeded building blocks - third round.