further refactoring to remove options we dont need