fixed most not auth 100%
Clean up