Cleanup common config/add htc audio