Remove hardcoded username appendix