Remove testing code
Moar cleanups