1. Add validity tests
2. Add validity checks
remove code form field
update production code with new tests and validation checks
cleanup production caplib