Removed the need for external files