cleanup generated code, remove unused stuff and update readme