removed old code that broke everything, and fixed a _this