Class delete, minor changes