Remove the currect user code which is buggy