partially restore the functionality of the use static market data flag
remove test code