Remove Caleb's simple proto-type