Fixed class name and path validation, removed unused class.