Remove unnecessary files and directories (merge errors)