removed warning and test code