Removing facades and using the auth contract