remove unneeded code and add info