Deleted more unused static templates