Remove code added for testing