Remove log lines
Filter decorations in the components. 

This reduces the number of intermediate objects we need to create. The 
downside is a bit more code complexity in the components.