Cleaned up g-s-d patches