Remove testing code, now functional