Remove unused
Use consistent selection argument style
Remove unused
Camel case
Clear cache when changing source
Simplify