Fixed warnings and removed duplicated files.