added doc / removed unneeded code