finished jwapi and cleanup