Cleaned up scene to avoid conflicts in the future