Cleanup blocks/items

Signed-off-by: Steven Downer <grinch@outlook.com>