add todos
remove dead code
improve UpdateApplicationSpec