Removing unneeded building blocks - second round.