Update Readme and cleanup