clean up 1st prototype