RTGOV-265 Remove @Dependent annotations