Cleanup dead idea
Add template