Removed testing logic