Removed some vestigial code copied from the web