Moved delete functions to static memeber functions.
Cod is slightly easier to read and is now warning free.