Cleaned up old variables