Remove old code that was causing issues