Remove unnecessary items and fix username in another place