remove parsing of template and remove old defines
Update plugin info files