cleanup jdo stuff