Some cleanup in /Common