Drop 10.7 (Lion) and Growl, refactoring