removed a lot of code that's unused still.