Current version of proposal
Cleanup