Makefile cleanup (just mozpub). Consider all disconnect categories