Cleanup unused IDs
Cleanup unused code
uhhhhh