Problems with images, ACF, inconsistencies

Thanks for a great product. Been using it on and off for years.

I'm having a problem with images using CKEditor 4.1. My requirements are to disable the standard image button, while still allowing images to be included in the editor content. Images are added via a custom file manager / file upload but this is not contributing to the problem. When loading the editor up with content containing an img tag, the image is shown at first, and then removed.

- The image button is disabled like so: config.removeButtons = 'Image';

I played with ACF a little to try to get it to allow images. 

- extraAllowedContent: 'img' when instantiating the editor, and
- config.extraAllowedContent: 'img' in the custom config file

This did not work. Strangely, running the 'filter check':

editor = CKEDITOR.instances['%instance_id%'];
editor.filter.check('img');

returns true.

I'm using an inline editor.

Have now disabled ACF: config.allowedContent = true, and this has prevented images from being stripped.

However, now when I try to align an image to the right, the text follows it. The support for a floated image is gone.

Question: How can I achieve all the requirements:

1. Remove the standard image button
2. Prevent the image properties dialog on double-click
3. Not have images stripped out (would prefer to leave ACF on if possible)
4. Still be able to align images to the right?

Thanks in advance