- removed old templtes
- fix depreciated functions