More deletions and adding authentication infrastructure