Removing dead code; test coverage now over 75%!