removed some pretty stupid stuff..