Found major bug. Removes currently unnecessary code