CRM-14449 api custom data behaviour - preliminary tidy up

E-Notice fixes & removal on non-required code. Note that on Grant the removed line is being moved to another location