added user deletion and cleaned up a bit