Clean up guide and take advantage of Boot-created beans