Comment fix and removing empty directory