cleaned up two Ids