Further changes, removing pre-built items.