Start refactoring issues without the API