Remove unneeded files and cleanup after merge