rm extra endpoints
rm whitespace
simplify with splat