Remove helper functions
More fiddling