Added check for NoSell
Cleanup