Cleanup of old prototyping stuff