reformat bindings and remove GCM for the moment