Edges removal (#3642) - Basecamp