Jh/cleanup