[app] public cleanup
[app] public cleanup