Cleaned up some duplicate composed node code