reverted delete class to keep compatibility with v1
added some backward compatibility with v1 and deprecated messages