Removed vestigial code since #4 was completed