Remove test code

Cleaner version without tests