Cleanup remove unused template