Renamte property
Remove unused scheme