Product view cleanup code