Remove merged commit for heynoti

Also remove pwdutils (double entry).