Cleanup incomplete code