Post merge code cleanup