Remove unused scene
Rename type and variables