Removed expectations, folder resources