Remove some code that isn't used and was causing buffer overwrite issues.