Cleanup
Include system improved.
Old tpls gone.