Removed abstraction code from fly and quack group - just extended it from both the quack group and the fly group