Remove unnecessary password get