Removed badly merged code