Cleaned up obsolete variables