Remove broken code
(I don't even know...how did that get there?)
fix block iterator
Move log to Spout