j7 setup updates and cleanup.