Removed unused/non-working floor code
Removed references to unused Floor code
Removed test scenes
Removing extra files added in merge conflicts