removing commented out annotations
add null check for username