Clean up annotation utils code - Frank