Permission node cleanup and removal of the commented out deprecated API.