Cleaned up the code when there is not external data.