Remove cut and paste crud
Remove cut and paste crud

kbase/user_and_job_state,kbase/user_and_job_state,kbase/user_and_job_state,kbase/user_and_job_state,kbase/user_and_job_state,kbase/user_and_job_state,kbase/user_and_job_state