Remove old, bad authorization logic