*8491* remove code for testing