Remove casting.  Changed return value of delete functions.