fixes for validation and routing. removed unused files