Fixed small mistakes and removed redundant file.