are you sure you wanted to remove these? I just wonder because you seem to have some merge errors above, so i want to double check.