Cleanup main template so we can start jading #27