removed spare things, got cases working