removed obsoleted code in v1.5