Actually, I'll write this down and address this in another PR, I think we just need to clean up this entire file.