Remove unnecessary complexity