Removed temp fields