Removed code used for testing issue #7