Removed model stuff and the last of the iterate/__iter__ references