Remove username check