clean up some parameter checks for rds

https://bleacherreport.lighthouseapp.com/projects/6296/tickets/17620-gantree-improve-code-climate-score#ticket-17620-1