[] Clean up forex instrument
[] fix up bonds