More work at hacking out IDs