[FIX] Remove swap-module dependency for Kiran