removed stuart user and added clean up of memory