Remove redundant files. Minor fixes.