Removed standard files + dependency loop fix