Removed access via app secret and refactoring