merges supervisor into application
cleans up callback implementations