renamings and remove python part