#4137 code tidy
#4137 cleaning up binding redirects
#4137 cleaning up binding redirects