cleaned up unused usages