Less debris, more shards

Signed-off-by: Bjorn Westergard <bjornwestergard@Bjorns-MacBook-Pro.local>