Cleanup - keeping just checkOptions method