Use single-quotes, remove unused params