Merge "Remove live folders"