Removed testing in main code