Major refactoring to remove all prompts