Trimmed usernames, removed unused require