Remove code used for testing?