Remove $ validation (Issue #23)