Removing some code thatll hopefully increase stability