Includes cleanup
Hook selection now works correctly when there's only a DefaultApplication given