No more blocks, got rid of the unnecessary child templates