Remove testing logic