Change authentication mechanism + remove redundant stores