Jclum cleanup