Limiter Removal

Ref: PSV-064