Removed Select Template from code