removed external dependencies
removed spaceholders