Remove unused, incorrect code