Minor Fixes

Eliminated unnecessary (and error) __destruct() calls