Cleanup on solution branch