Remove the redundant password function