unused class removal and client cache proxy clean up