cleanup package definition. do not export plural forms