Removed unused/untested code