Remove unnecessary code.
Fix file naming.