Removed untested code