Cleaned up chicken command macros, handle setup-api modules