Cleaned up windows authentication