Removed klein/klein dependency