WIP: Start intensive cleanup of guides/samples