Doc updates and remove unneeded code