Looks like we're still using it in most of the code. So lets run with it until and refactor later.