Include only files in /ckeditor/ dir
Remove code after incorrect upstream merge