Deleted things? these didn't end up in the last commit somehow