Remove merged code