Update Readme and remove some code