Cleaned up the ID table