Made deletion of objects cleaner.