Removed testing return statement