Small fixes. Removing duplicated files.