Remove some excess code that was generating error messages