Changes in deletion functions for using class methods