Cleaned up the old public variable