Clean up code and tidy up ready so that accept default rules can work.
Clean up code and tidy up ready so that accept default rules can work.

fasaxc/felix,kasisnu/calico,beddari/calico,kasisnu/calico,neiljerram/felix,alexhersh/calico,neiljerram/felix,alexaltair/calico,ocadotechnology/calico,anortef/calico,fasaxc/felix,anortef/calico,alexaltair/calico,nbartos/calico,TrimBiggs/calico,ocadotechnology/calico,Metaswitch/calico,nbartos/calico,matthewdupre/felix,alexhersh/calico,TrimBiggs/calico,Metaswitch/calico,neiljerram/felix,beddari/calico,matthewdupre/felix,neiljerram/felix