Simplify directive for server side validation errors.
Cleanup modules.