Cleanup.  Added passwd directly (for now)