Revert "CVS OPTION ADDED, minor improvments"

This reverts commit cd43b26d504623069338c45bf5708bc0434173d8.