Fix up style
Delete
Fix merge