Remove argument validation (uneccessary complexity)