Use destructors instead of cleanUp methods