Cleanup. End version prototype