Removed merged code from dist version