Cleaned up unused data
Fixed scenarios names