Reenabled auth and removed redundant variables