Hopefully PHP 5.3-ized now, removed unused template files