We need to clean all this up

real bad.