Code clean up after merging from upstream