Removed testing blocks