Removed some JK/JA only code