remove unused #import-s
client: always use rds_ prefix for our Winch categories
client: cosmetic changes