Cleanup in basic templates.