Removed old code + cleaned up passport config