Remove testing functions