organize things, get rid of old pass