Here we remove the original interfaces and move them directly to the places they are used. Interfaces are still genereric, replacing them to a specific interfaces should be done when these parts of code are touched. In addition, in this PR were fixed presubmit warnings in the files that were touched.