package definition cleanup