Getting rid of unnecessary params