Removed kick handling code altogether