fix Class name and delete bottle block